osm: Fix errors when compiling without expat.

diff --git a/osm.c b/osm.c
index 4900f069d28e5569ed5bfb683511e1b61c97a3a9..283d321eeb2ac3705ba3d67560c3d9ab0a9a55a6 100644 (file)
--- a/osm.c
+++ b/osm.c
@@ -46,21 +46,6 @@ static int node_id;
 static route_head *rte;
 static int skip_rte;
 
-#if ! HAVE_LIBEXPAT
-
-void
-osm_rd_init(const char *fname)
-{
-       fatal(MYNAME ": This build excluded \" MYNAME \" support because expat was not installed.\n");
-}
-
-void
-osm_read(void)
-{
-}
-
-#else
-
 static waypoint *wpt;
 static int wpt_loaded, rte_loaded;
 
@@ -415,6 +400,22 @@ static osm_icon_mapping_t osm_icon_mappings[] = {
        { -1, NULL, NULL }
 };
 
+#if ! HAVE_LIBEXPAT
+
+void
+osm_rd_init(const char *fname)
+{
+       fatal(MYNAME ": This build excluded \" MYNAME \" support because expat was not installed.\n");
+}
+
+void
+osm_read(void)
+{
+}
+
+#else
+
+
 /*******************************************************************************/
 /*                                   READER                                    */
 /*-----------------------------------------------------------------------------*/